From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 28 May 1993 17:23:47 +0000 (+0000)
Subject: (Info-default-directory-list): Take out ../../info.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~95849
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e562af697cf6a8a3eeceed3b27ebdb0591656476;p=emacs.git

(Info-default-directory-list): Take out ../../info.
Avoid duplication.
---

diff --git a/lisp/paths.el b/lisp/paths.el
index b618f0186c0..b3ced84da18 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -32,11 +32,16 @@
 ;;; Code:
 
 (defvar Info-default-directory-list
-  (list "/usr/local/info/"
-	"/usr/local/lib/info/"
-	configure-info-directory
-	(expand-file-name "../info/" data-directory)
-	(expand-file-name "../../info/" data-directory))
+  (let ((start (list "/usr/local/info/"
+		     "/usr/local/lib/info/"
+		     configure-info-directory)))
+    (or (member configure-info-directory start)
+	(setq start (nconc start (list configure-info-directory))))
+    (or (member (expand-file-name "../info/" data-directory) start)
+	(setq start
+	      (nconc start
+		     (list (expand-file-name "../info/" data-directory)))))
+    start)
   "List of directories to search for Info documentation files.")
 
 (defvar news-path "/usr/spool/news/"